Don't unref NULL. (#316828, Tor Lillqvist)

2005-09-28  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkclipboard.c (request_image_received_func): Don't unref
	NULL.  (#316828, Tor Lillqvist)

diff --git a/ChangeLog b/ChangeLog
index efdaa2233a07d97f04c384827a20a29ed2f388c1..cf354ebab1ddb13afbb94faf0ca93e0ba78716d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkclipboard.c (request_image_received_func): Don't unref
+       NULL.  (#316828, Tor Lillqvist)
+
 2005-09-28  Tor Lillqvist  <tml@novell.com>
 
        * modules/input/imime.c: Include <config.h>. (#317444, Kazuki

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index efdaa2233a07d97f04c384827a20a29ed2f388c1..cf354ebab1ddb13afbb94faf0ca93e0ba78716d0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-09-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkclipboard.c (request_image_received_func): Don't unref
+       NULL.  (#316828, Tor Lillqvist)
+
 2005-09-28  Tor Lillqvist  <tml@novell.com>
 
        * modules/input/imime.c: Include <config.h>. (#317444, Kazuki

diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 8e1f52e50ede064e1a9c29c6b9dd9671c3aab154..d7692a8b0ec321cdfb0fcff03f6a9899678b1fa7 100644 (file)
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -1033,7 +1033,9 @@ request_image_received_func (GtkClipboard     *clipboard,
 
   info->callback (clipboard, result, info->user_data);
   g_free (info);
-  g_object_unref (result);
+
+  if (result)
+    g_object_unref (result);
 }
 
 /**